From: Jan D. <jan.h.d@swipnet.se>
Date: Thu, 2 Dec 2010 09:33:57 +0000 (+0100)
Subject: * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5498
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0715678f3e7a3874df7cefd3db17d3e3f1822259;p=emacs.git

* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 91687c38938..6da34eef55a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-12-02  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
+
 	* nsterm.m (ns_draw_glyph_string): Switch fore- and background if
 	drawing text under filled box cursor (Bug#7479).
 
diff --git a/src/nsmenu.m b/src/nsmenu.m
index b6ee93bdf6b..973f2c15e2f 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1049,10 +1049,15 @@ update_frame_tool_bar (FRAME_PTR f)
         {
           idx = -1;
         }
+      helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
+      if (NILP (helpObj))
+        helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
+      helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
+
       /* Ignore invalid image specifications.  */
       if (!valid_image_p (image))
         {
-          NSLog (@"Invalid image for toolbar item");
+          /* Don't log anything, GNUS makes invalid images all the time.  */
           continue;
         }
 
@@ -1066,11 +1071,6 @@ update_frame_tool_bar (FRAME_PTR f)
           continue;
         }
 
-      helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
-      if (NILP (helpObj))
-        helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
-      helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
-
       [toolbar addDisplayItemWithImage: img->pixmap idx: i helpText: helpText
                                enabled: enabled_p];
 #undef TOOLPROP